From: Joakim Verona Date: Thu, 12 Sep 2013 15:01:58 +0000 (+0200) Subject: merge from trunk X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3525167e356666b1d0ffc9c18d6e429174168deb;p=emacs.git merge from trunk --- 3525167e356666b1d0ffc9c18d6e429174168deb